FIXED EVERYTHING NEEDED TO BE FIXED :D