Fixing more stuff.... don't worry didn't mess any of your UI stuff up :)