fixed A LOT of stuff