Better makefiles (hopefully)