Bugs fixed.
Merge.