bug fixes from merge and prev. stranded code. NexsonDiff test failing