New units
sort
Add some units
Correct unit
Remove redundant collector
Consistent naming