Add final corrections for first version