fixed so things are handled correctly, if there are spaces in paths