add minor tweaks, remove some cruft