Some few changes.
Merged.