Code Refactoring

* Player now singleton
* some other minor changes