cleaned up makefiles and such even further.