Some cleanup and typo fixes.