fixed all bugs from the changes that have been made to the schema