Fix things, change to SI
Bugfix