Adapted new grammar, improved alloy generator. Alloy generator currently handles f, g, x, u expressions.