Added a few things and changed things