Added and changed some stuff