Maybe fixed a few things