Added and changed a few things