clarify and update comments