changes to config, local paths
changes to makefile in misc