Change visual highlight again
Fix diff colors again
Clean up comment cruft