Some basic changes to makefile.