did some renaming to clarify samples
further cleanup/polishing of examples