Update stored settings after successful save so backup works as expected
Fix bug in restore functionality and improve error logging