HuD improvements

still incomplete