fixed a ton of errors