Added pkgmod stuff, added stuff to make_config