Ert 480 submit

This PR contains fixes and preparations for an issue with instable calculations of whether a cell contains a point x,y,z; the actual cell contains problem is not yet fixed.