Fixed some stuff, added some stuff. Wes!