adding more sample content

also fixed some validity errors, did some restructuring