Fixed bunch of stuff.