removed old stuff, misc enh.