more logging, more structure in autoresolve