Addressed first round of commented issues