Fix table formatting + couple of fields (#391)