more fixes after merge. I missed some >>>> and variable name changes.