Minor fixes, more verbose output.