Class clash check, Datbase names updated, Bugfixes