AutoStart and more fixes to sweep loop