Changed UNIQUE statements in the database table definition so that they make sense...