Continue 3d pipeline, fix others