A few basic fixes, noun phrase support