Finish writing new CSS commenting plus a few minor tweaks