Fixed more scoping issues (for $x in $x, for $x at $p in $p)
Fixed more scoping issues (for $x in $x, for $x at $p in $p)

28msec/zorba,cezarfx/zorba,bgarrels/zorba,cezarfx/zorba,28msec/zorba,cezarfx/zorba,cezarfx/zorba,bgarrels/zorba,bgarrels/zorba,bgarrels/zorba,28msec/zorba,bgarrels/zorba,28msec/zorba,28msec/zorba,28msec/zorba,bgarrels/zorba,cezarfx/zorba,cezarfx/zorba,cezarfx/zorba,28msec/zorba,cezarfx/zorba,28msec/zorba,bgarrels/zorba,28msec/zorba,cezarfx/zorba,bgarrels/zorba,cezarfx/zorba