Corrections on form and modifictions on index