adapt to mvidner reviews
changes