Typo's fixes and minor improvements