added some things to playback, refactoring, etc