fix most of the errors, 15 left