Changes to a lot of things.
Merging.
Fixed merge issues.