Fix of typo and other minor improvements