Setup some tests for scripts.  #6
Switch to a simpler grammar.  #6