fixed a lot, added ODE