Almost

fixed the Z index problem.  Fixed minor problems