Merge Jose & tweak to fix SurgeryTypes, VerdibreaLevel

Merge Jose & tweak to fix SurgeryTypes, VerdibreaLevel