Some fixes
Massive snippets cleanup