redesign parsing system
improved operator detection