More player controls, minor edits