More bug fixes for and better organization of examples.