Further 'auto' looping and some refinements