Make some passages more clear and add more details in the last note