Updated some bits and bobs.  I hate checkstyle