Split and combine controllers, database end commited, database bugs fixed