Cleanup
misc
General optimization
Testing changes
Implemented Boolean in ErrorListener