Finally fixed a bunch of stuff.