Move casefolder to arguments; delete extra "junk"
Add ms eg that estimates M