updated CHANGELOG and fixed up local() some more.