Add preliminary metric unit support
Fix a touch of formatting