fixing #33 and adding some unit change units