Fixed stuff because shut up Tom