fixed a few things again