Fixed bugs and optimised code in Player class
Merge for Final Code