Feature subscribe

As proposed renaming subscribe methods and adding recv and emitter peers as arguments
some minor fixes while we're at it