Fixed (nearly) all problem with loops and helpers/if
Removed minor merge conflict