Combo the cross components & Fix comments