A few UI and output fixes