change some data value names. also made some simplifications