fixed more pull review issues