adding snip support and a few misc