various fixed
Merge pull request #32 from ActivityRez/chris-misc-fixes

various fixes