hopefully fixed issue with Edge.blockForHandshake()
NC.addPeer() issue
concurrency is hard
:( I'll work on this tomorrow
completed merge of master
okay, maybe this will finally work
it looks like everything is working now\!