fixed a LOT of stuff