Changed substitute to be off by default, and other fixes.