Minor notation changes and fix wrt R_J and R_G.