applied comments; fix errors from merge and update NEWS file