Updated paths and comments