ENH: Clean up examples and minor fixes