a little more progress, with Benedikt's help