FIX: some small fixes of the grammar