space and filenaming fix