Making the genesis block happy again, and some more indenting fixes because I like clean code.