Minor fixes and phrasing enhancements