Some clean-ups
Terminology change for improved clarity and consistency: "play" to "move".