Fixed some stuff.

Josh is going to add his massive changes from this.
-Steven