Additional MSWITCH blocks added - some bugs

Answer changed slightly, need to de bug now.