added a few things, and changed a few things