Improve stability
Track switch and case keywords too
Improve trim() functionality
Support case T/F reporting for switches