map names can now be multiple words, also fixed path issues