more tweaks on success+error