JC: more index and fix minor bug.