Update Makefile
Update changelog
Updates