Ability to control output file type (ext)
Minor updates.