minor fixes
Merge pull request #124 from jhaybie/finalTouches

minor fixes