Adding pathing for #607
Fixes #607
Accounting for multiple updates for #607
And again for corp #607
Bad index call #607