fixed a LOT of errors...