General improvements; add cancel routine.