Adding and improving some snippets, also refactoring code to be able to develop in local