initial commit with fixes in db-tables