Move opIndex to its standard position before opIndexAssign
Fix parseSurface

Includes general comment updates