Fixed Cartype Contoller & updated references