enhanced notes, markup, and fixed image-link.