removed some of the context conditional, updated docs