small generics changes
reverting sweeper interval to 2 minutes