Makefile: integrate arter97's optimizations

Conflicts:
	Makefile