Fixed some errors but not all.