Upgraded commenting on existing code.