Repeating RMSE calc for E
Fixing minor merge conflicts