25 minor changes