Slightly more efficient compute code.
Several fixes, compute stuff fleshed out a bit