minor enhancements (made during reinstall)