Minor variable name changes.  Tested changes to unify(), they work.
Merge branch 'guff' of https://github.com/kristinbranson/JAABA into guff