more fixes from review