Fixed everything
Fixed