fixing a number of things