minor bugfixes (table names); get rid of warnings(Jenny)