FIX: bold and italic handling improved