various fixes
fix table names