resolve/fetch methods emit same events independent of state

so you don't have to know the underlying logic of the implementation. some other small comments/cleanup as well