Fixed some block formatting. It is clear all of the blocks need a
rewrite.