Added and improved comment code.