Index tuning. Bug fixes. Need to move special adjustment validatoin into the model.