Add a few more snippets, fix errors as per #332

Hopefully this looks better, @SirVer!