Improve documentation, + one code fix