Updated header comments.
Added tests for subStr.
Cleaned up some comments that clash with built-in comments when generation documents.