backup data ok and other minor fixes