Some fixes
MapCPS using added
Compare delite
Сhanging the way of simplification