fix --quiet/--verbose and more improvements