Better docs and code to match