fixing a few bits.