Added snippets, and a few other cleanups.