Fix typo's

Also: more tweaking!