Updated Scope, fixed repeat/until scope parsing, added stuff to the lex output