Minor tuneupts
Merge pull request #7 from mistercrunch/minor_touchups

Minor fixes, utility functions