Add more optional variables for Eval (and use by other module functions as well)
(#474)
Add file_num to arglist for top level build functions (fixes bug noticed in demo8.py)
(#474)