changed lots of folding behavior, etc