Some comments added, and slight code clean-ups.
5 files changed