some cleanup and new snippets