Speeding up things, not quite there yet. Cleaning up examples.