Fixed the HUD, code cleanup, few fixes
Haven't had much time due to Calc to work on this last few days