fixed a bunch of things...