initial conditions from plot, other minor changes