Q2D and Q3D additions and fixes