Major updates!

Folding should be faster and more reliable!