I think I fixed a bug or two too, but I can't remember and you can't run this code yet, so it doesn't matter.