Minor nicety changes
Merge branch 'guff' of github.com:kristinbranson/JAABA into guff