More stats and all kinds of cleanup