Made some changes.(see description)

last section is not updated. only changed the method names, not the description. If possible, change the description when u get time, else we will do it tomorrow.