bug fixes + more verbose output