Almost ready for turn-in.

Just fix up some comments and reorder some things.