added and removed a couple of things