Makefile improvements

Give me a call and I'll explain the changes