Minor comment stuff, mostly