fixed a whole lot