Made the output a bit more informative, and suppressed some warnings.