fixes for when there are spaces in directory