Lots of fixes for handing of peer presences, error messaging, removed old code, etc