Fixed a bunch of stuff. I am terrible at commenting commits, hope iget
better.