finish Player

and some minor changes