Fixed bugs in the grammar for MAD-X