mapper output class (and little typos)