Makefile: lots of changes