fixed a TON of errors