Adding motion-support
Fix loaded_channel so we return th channel
Better automation handling