diss: meeting with Thomas, mainly structural tweaks