add index & fix some