fixed a couple of things