Just added/modified some comments