some fixes
more fixes
Merge branch 'master' of https://github.com/themitch/remcovsmitchel