Several updates.
Fixed merge conflict.
Changes.