remove useless comment
add options to keys that will trigger a reconfigure
Merge branch '5002-switchboard-opt'