More stuff for @csi7585
Merge pull request #3 from stevencl/more-edits

More stuff for @csi7585