more changes to handle spaces in project directory names