All tables working. Bugs fixed