Add and fix snippets