Removed more errors and fixed the tables