Fixed some bugs and made the player mode sytem and messages make more
sense