Fixes still rolling in, grammar implementation coming