Clean up the makefile
update the changelog