Tweaked examples and code