simplified some example names and paths.
other minor fixes.