fixed a bunch of shiat
fixes stuff