Fixed verbose output and error messages