fixed a couple of bugs need help with this one