lots of fixes
improving backups