Fixed a few things.
merge