Merge the indexfix  and comments clean up.