Fixed everything except the tau pat stuff