changes and bugfixes to Grid/Unfolding