fixed a few more things