Now supporting dry run

And some output fixed