Intermediate checkpoint: comments and non-functional fixes.
Incorporated Leslie's style and class changes from the ProgrammingLab branch.