fixed interoplation and added proper terrain
fixed merge conflicts maybe