latest changes according to CB's comments (emails from 20130320-22)