refactorings; playback adapted; UI cleanup