minor changes, added more tables