minor fixes to match software design
Merge pull request #28 from MartyBurns/master

minor fixes to match software design