Merged user context and values into computationcontext object that captures the entire context
Clean up comments and naming on computations
Added debug sanity checks again