Snippets, few bugfixes