Made a bunch of updates to e_matrix