updated changelog, trying to get a merge going here.