Fixed some of the weirdness.