ENC_PER_DEGREE tweak and TODO's