major simplification to mode change logic and to kscope advertisement on mode change and at startup closes #612