small fixes
Merge pull request #139 from ActivityRez/chris-fixes

small fixes