Updated some defaults, basedir changes