I fixed the bugs.  I'm going off to eat, I'll commit again when I come
back to show I haven't done anything