Pygmysnip tweaks and improvements