Adding some snippets and fix some stuff