Added more examples. Additional code cleanup.