new DB, editing, fix some errors