HUD work in progress
Some minor changes and preparations