Updated and changed a few things.