+ Various improvements on units calculator