Some bugfixes + new snippets!