Linted and Hero'd

Lint 100% a ok, js i and j loop var not defined errors