Made some more minor improvements