Adjustments and a typo fix.