3D almoust done -> fix some exceptions