fixed a few things2