Makefile tweaks

Conflicts:
	Makefile

Additional Buildflags