fixed a bunch of garbage