More refactor and always upload setting. Fixes issue #2.