Identify and fix several bugs, hard-code for 1d evolution