Bugs fixed.
Backup commit.