pushing review comment fixes (partial)