Cleanup + fix some examples