Made some changes, though with errors that I will fix later.