fixed and improved snippets