did and fixed a bunch of stuff