fix backup
more fixes