Too Lazy to put in a good commit name.

Fixed a lot of stuff