Fix return values; sort units differently because the order method was not working...