Get comment colors right and other fixes