latest 3D fixes, includinf 3D decomposition