added and fixed a couple of things