Some more changes.
Merge and some small changes.