preparation for SEHOP and small fixes in analysis output