More changes to comments. Bug fixes and what not.

Essentially done.