Fix defined values; improve comments