Code fixed and comments