Remove update eip definition call causing collision
Fix bad for loop maths, rookie!