Fixed everything joel broke and more!