Combo check and improved comment