Fixed more tables, and added counting to its own section