More player controls

+ Extra fixes