Changed whitespace behaviour and allowed filenames to be recognized.