fixed a little more