Added link to tables, fixed a lot of inconsistency, added override for doing the body