Patch trouble updating cooldown saves

Cooldowns are in an alternate key and need careful special handling to
prevent trouble.
Also, do everything possible to catch errors with minimum damage.