Somewhat improved docs