bugfixes
updates to peerhandler