improve / update comments