fixing sweeper issues