add some missing MultiParamTypeClasses and cleanup