new fixes and cmorgan ToBEx kit patches - phase 1