Fixed database inconsistencies and typos