Yet some small additions

-prevented double marking of bad channels

please first merge on request, meaning tomorrow :-)