fixed a couple more