Added better syntax analysis, still grubby