Lots of improvements to harmonizing code. but still lots to do