Add a some additoinal comments, fix column widths, and add final modifiers
Further comments + tidy up