fixed a few