Feature/more verbose

This depends on the PR for #16.