Fixed E(r0) figure and many small todos.