more renaming and such
diag should comment each line in the message
format failure message properly
use the right stack level