fixing a few bits