fix stats, clean up some deps