Updating: improving Makefiles
Updating: minorly improving