Updated and cleaned up a few things.