fixed up the make files and config files