2 bug fixes, verbose feature, smaller changes