fix pause/resume and new-lap