update to merge my local files that weren't uploaded apparently and mgmetal's push and fixing the hailfire possibly crashing the game