simplified debugging output. some renames.