- fix one more problem with internalize - fix variance/contravariance problem in substituterec - cleanup