more error message formatting and tweaks