Added some stuff, cleaned up some stuff.