Improved documentation, minor layout tweak.

- No longer include `@` in the context name automatically