Update CHANGES, fixed Makefile