Add verbose mode + cli report and implementation improvements
Fix tests