fix ForStatement scope
add comments parsing