some more error/success message tweaking