diff --git a/version0.4/ebnf.cpp b/version0.4/ebnf.cpp
index bb4c78c..908aff4 100644
--- a/version0.4/ebnf.cpp
+++ b/version0.4/ebnf.cpp
@@ -18,7 +18,7 @@
 	<string> //STRING
 	<!> <identifier>|<scalar>
 	<identifier>|<scalar> <+>|<->|<*>|</>|<~>|<and>|<or>|<==>|<!=>|<<>|<<=>|<>>|<>=> <identifier>|<scalar>
-	<(> <scalar> <)>
+	<(> <identifier>|<scalar> <)>
 <2><scalars> ::=
 	<scalar>|<scalars>         <,> <scalar>|<identifier>
 	<identifier>|<identifiers> <,> <scalar>
@@ -56,9 +56,19 @@
 	<var> <identifier> <=> <func> <(><)> <{> <statement>|<statements> <}>
 	<var> <identifier> <=> <func> <(> <identifier>|<identifiers> <)> <{> <statement>|<statements> <}>
 <10><loop> ::=
-	<...>
+	<while> <(> <scalar> <)> <statement>
+	<while> <(> <scalar> <)> <{> <statement>|<statements> <}>
+	<foreach>|<forindex> <(> <statement> <identifier> <)> <statement>
+	<foreach>|<forindex> <(> <statement> <identifier> <{> <statement>|<statements> <}>
+	<for> <(> <statement> <scalar> <;> <identifier> <+=>|<-=>|<*=>|</=>|<~=>|<=> <scalar> <)> <statement>
+	<for> <(> <statement> <scalar> <;> <identifier> <+=>|<-=>|<*=>|</=>|<~=>|<=> <scalar> <)> <{> <statement>|<statements> <}>
 <11><choose> ::=
-	<...>
+	<if>|<elsif> <(> <scalar> <)> <{> <statement>|<statements> <}>
+	<if>|<elsif> <(> <scalar> <)> <statement>
+	<else> <if> <(> <scalar> <)> <{> <statement>|<statements> <}>
+	<else> <if> <(> <scalar> <)> <statement>
+	<else> <{> <statement>|<statements> <}>
+	<else> <statement>
 <12><statement> ::=
 	<definition>|<assignment>|<__func>|<loop>|<choose>
 	<identifier>|<continue>|<break> <;>
diff --git a/version0.4/nasal_interpreter.exe b/version0.4/nasal_interpreter.exe
new file mode 100644
index 0000000..df615d0
Binary files /dev/null and b/version0.4/nasal_interpreter.exe differ