REF minor errors & changes.