Verbose option, bug fixes