Tidied up some comments and tweaked init defaults