fixed pop issue and interpolation proof mode issue
merge with push/pop fixes
merging fixes with unstable