changed the builder a bit to produce working config files, altered makefiles to icc (again)