updates adding underscore, and other niceties