Fixed warnings
Moved long range force calc up, for better.
Merge branch 'espresso'