fixed a whole lot of things