Fixed operators and add new unit defs