big reorder and adding some new snippets