Address review comments, move to incubator spark


Also includes a small fix to speculative execution.