Added some, changed some