Fixed the paths, minor updates