Repaired numbering, 0 is placed corectly when name contains 'AFRONT' string
Update of TODOs