A typo and a couple of logic errors fixed. I think there may still be one

or two kinks lurking around, but it now appears to deal with the basic
test cases ok.