-- changing makefiles, some other updates