Bug fixes
Refactored some documentation in anticipation of using smartcomments