fixes
merge
Merge branch 'master' of https://github.com/projecttouch/projecttouch
player tidy-up