Re-fix of array identifiers. Fixed incorrect path arithmetic, and array references.