cleanup now operates in full 3D
bug fixes.