removed a bunch of errors