support multiple units, small fixes