Add some new snippets, update some comments