fix a bunch of errors that were failing on