Updated Makefiles and some backwards compatibility Alan suggested.