Fix docs and comments