Docs and comments #4