Updated paths + minor fixes