more sweeper improvements