More examples, and some small cleanups/fixes