added fixes for player