Player FSM & bug fix

Player FSM & bug fix