Cleaned up and updated a few things.