clean up and add some handy indexes