Better playback

Fixes #1