Enh/misc -  a few cleanup and enhancement changes