Fixed stuff

I think it's much better now