Cleanup, updates examples.