fixed AddRest duration & cleanup