More fixing of dave's HUD code