timestep improvements, misc fixes