hand merged in vision code - minor warning compile errors