Fix many convolution bugs, prepare for 3D scene