oops. Yes, quite a lot of things changed a little in there. Apparently I missed copying over the subtractions.