MOD: some report editing. soon more