Changed default a=1.5 instead of 12.5, rearranged short_range in msm.c so
that no conditionals, loops nested as much as possible, and correct.