Manage Context better
Fixup documentation