fix success callbacks and labeling of errors