Small changes throughout.