Minor UI tweaks and error message alterations.