Bug fixes to forces, merged b1_x and b2_x into b_x