fixes #12 and a minor bug with stepping off the stage