- fix FCs 
- improve response time on switch message type