several new snippets and minor code tweeks.