final pass minor fixes
Merge pull request #4 from ged-lab/cleanup

final pass minor fixes