some bugfixes
Merge branch 'master' of github.com:PeerKit/peercdn
lol