improved url build
completed new url & file generation