Added more verbose messages, squelched an error message
Removed whitespace