player fix
intermediate fixes
Merge branch 'bugs'