fixed a few things :)