Cleaned up a few things, fixed some more.