better support of pictures, references and hyperlinks