more fixes from full review