Added a play button and cleaned up some code.

Possible double commit, the previous one seems lost.