Better beam normalization to zenith using interpolation to exact location
Update observation wrappers