fix lambda, links, and class methods