Added some h-adaptive stuff -- cem