Add spin-spin terms and various incomplete nonspinning terms