Updated a little of the commenting