Add handling of numeric entities. Add speciall spacing after literal entities.