Updated to compute J(w), and included a few switches