UI enhancements, output fixes, cleanups