fixed a few things