Enhancement #37 complete.
Cleaning up some comments and code clutter... moving TODO statements to the Git repository's bug/enhancement page