fixed a few bits