Fixed all issues that were causing bugs in Player due to my last commit