Fixed some errors, but there are still others