small changes from Combiz review