Cleanup and units
Complete SI units coverage