many improvements - better stop - doc examples