Fixed everything

WUHU!