fixed index issues
cleaning up