fix a bunch of errors