Fixed everything! (Mix of old versions and new stuff)