new table names in DB + some minor changes