Fixed some tables. Almost completed correctly