Using potential scaler rather than kinetic
use EPS O(1e-6)
Merge branch 'master' into potscale