merge attempt II, electric boogaloo

My eclipse still won't prompt me when I make any syntax errors, so
hopefully this update is mostly error-free.  Anyway, will try and have
my eclipse pull itself together etc...