HW4 index fixes & minor adjustments