added RK4, cleanup