Tllambassador ,General unit improvemnt to match arm/core and fix unit pickup failing