Improve output, add progress