Few minor changes to body, tables