Add file parsing option, no import option and tidy up output.