folded some superfluous unit types together

otherwise 'estimate' got confused as to what some unit types were since
they had the same basic units