make Makefile more elegant
update changelog