fixed a lot of path and made it better!