Self-doc improvements