Get examples working, add header output for each example,
some minor cleanup/fixes in classes