Various commits for new auto-backup code, etc.