exanding use of corpus mapper
sorting improvements