fixed aforementioned play bugs

not many commits from the rest of the team yet.
Revert "fixed aforementioned play bugs"

This reverts commit 2755d10a1782a235c7590d930bd3d1d4897f5ff6.
Revert "Revert "fixed aforementioned play bugs""

This reverts commit a2e763142fef1873caaabc2afdddab397afba347.