CS 360: some more minor tweaks.