hardening.
Fixing bugs from id name changes.