folder saving improved (now saving when the scan folder button is pressed) and other minor improvements