Updating comments and examples to reflect new code