tidy; move PlayerState out of BoxyControl