Added and changed some comments