Updating docs and comments