minor changes throughout