add some snippets and other small changes