Updated stuff.
Fixed merge issues.