Fixed some errors, found some more.