Fixed mistake in rhs
Better steamlining of initial conditions.