Some buggs and database update