Various new snippets and fixes