fix markup, add comments, final images