finished unit items enh. modeling
clean up