various minor enhancements, UI changes