Fix & touch-up

3.1