Fix typo; clean up messages