Fixed everything that was wrong from last commit.