Bugfixes and HUD implementation