Update CHANGELOG based on Jeff's feedback