Minor improvements in the setup tool and readme.