Again fixed a few things... -_-