Made some more minor tweaks