Added a bunch of new comments, minor code clean-ups.