Small design changes
Made the handling of spaces in file names less stupid