Add ToC and correct step numbers