Updating comments to be more accurate and fix typos