halfway through updating grammatical category analysis
fixed merge conflicts