Did more work on the comments, and fixed a couple of glaring bugs.