fixed a few thinks