sorted out some time integration issues