Tweaks and typo fixes