Fixed a lot of stuff involving paths, etc...