fixed a bunch of broken pieces