Added unfolding, many other misc imporvements