Not yest tested, but 'completed' the addition of elif's into the grammar.