fixed a few more