Message cleanup and typo fixes