snippets improvements