diff --git a/scripts/eplf_edit.py b/scripts/eplf_edit.py
index ab731a9..7d03e4d 100755
--- a/scripts/eplf_edit.py
+++ b/scripts/eplf_edit.py
@@ -191,11 +191,6 @@ def write_main_file(file,inp):
   print >>file, "# %s"%(inp.name)
   print >>file, "####################"
   print >>file, ""
-  print >>file, "# Edit"
-  print >>file, "# --------------------\n"
-  print >>file, '# edit(geometry)'
-  print >>file, '# edit(grid_parameters)'
-  print >>file, ""
   compute = filter(lambda x: x.startswith("compute"),rw_data)
   print >>file, "# Clear"
   print >>file, "# --------------------\n"
@@ -205,12 +200,18 @@ def write_main_file(file,inp):
   print >>file, ""
   print >>file, "# Computation"
   print >>file, "# --------------------\n"
-  compute = filter(lambda x: not x.endswith("_grad"),compute)
-  compute = filter(lambda x: not x.endswith("_lapl"),compute)
+  print >>file, "nproc = %d"%(inp.nproc)
+  print >>file, ""
   for p in compute:
     x = ' '
     exec "if inp.%s: x = 'X'"%(p)
     print >>file, "(%s) %s"%(x,p[8:])
+  print >>file, ""
+  print >>file, "# Edit"
+  print >>file, "# --------------------\n"
+  print >>file, '# edit(geometry)'
+  print >>file, '# edit(grid_parameters)'
+  print >>file, ""
 
 
 ## Execute temporary input file
@@ -221,7 +222,7 @@ def read_main_file(file,inp):
   lines = file.readlines()
   for line in lines:
     line = line.lstrip()
-    if line == "":
+    if line == "" or line[0] == "#":
       pass
     elif line[0] == "(":
       line = line.replace("( ) ","=False inp.compute_")
@@ -232,6 +233,8 @@ def read_main_file(file,inp):
     elif line.startswith("edit") \
       or line.startswith("clear"):
       line = line.replace("(","('").replace(")","',inp)").lower()
+    else:
+      line = "inp."+line
     exec line