Added some things, cleaned up a bit.