Improving units, choosing based on locale, #196