Fixed formatting and added tables