Updating documentation and comments