Small adjustments for numbering and special chars