comments added and playback cleaned up