resolved merge stuff
Fixed a few things.
Major re-hash