Minor code and readme changes including comments
Merge remote-tracking branch 'divemonkey/master'