Fixed some problems with sinks and block timesteps