add equation for general entropy
remove some todos