fixed execution model and cleaned up timeseries code