Added unique constraints and primary keys.  Also added COLLATE 'C' to order by where possible