snippets and a few tweaks