Many updates, in particular w.r.t. debugging.