Fix SI units
A couple of fixes
Merge remote-tracking branch 'origin/master'

 this merge is necessary,