fixing a couple of thing