added uploads and testmail option