Added more examples, minor comment refactoring