Fixed #2 and Updated the hud