changed validation and examples for use with new class structure, #24,#25,#30