Refs #5109, also fixed some typos