-FEATURE:  improved the unit handling further