Improvements to examples and such