fixed a few stuff