HUD and some fixes