Big ol' Patch

Lots of bug fixing and changes that i didn't keep track of very well.
I get carried away with bug fixing and enter a medative trance that not even fire can get me out of, or icecream.