Removed warnings, re-implemented rk4 integrator