more fixes from reviews