More generalized stats tracking, better JID-based peer tracking, and cleanups #302