Fixed a few index naming and loop ordering bugs.
Fixed a few index naming and loop ordering bugs.


iakovos-panourgias/fluidity,jjo31/ATHAM-Fluidity,jrper/fluidity,jjo31/ATHAM-Fluidity,rjferrier/fluidity,jjo31/ATHAM-Fluidity,jrper/fluidity,jrper/fluidity,iakovos-panourgias/fluidity,rjferrier/fluidity,jrper/fluidity,rjferrier/fluidity,rjferrier/fluidity,iakovos-panourgias/fluidity,jjo31/ATHAM-Fluidity,jrper/fluidity,iakovos-panourgias/fluidity,iakovos-panourgias/fluidity,jjo31/ATHAM-Fluidity,rjferrier/fluidity