Adding a few things and changing a few things