fixed stuff with spaces in the name