fixing success/error messages