Some practical changes.
Merged changes.