upgrades, tweaks...
small tweaks on snippets