updated Gui, added some tests to Player.java