Fixed a few small things.
Fixed merge conflict.