Minor improvements/bugfixes with start/pause/reset