Adding and fixing up some snippets