Fixe some notes, remove an example. Commited from Adams mac