Snags

merge first bunch of snag fixes