more fine tuning, worked on missing channel handling