index final format

more clean up needed, but so far so good.