Commit #18.1

-var references
-if changes