Updated CHANGES and some cosmetic cleanups