Multiple link types allowed (as for citation types): https://github.com/charmeproject/charme_plugin/issues/83
Correct version of modified annotation shown at all times: https://github.com/charmeproject/charme_plugin/issues/82
Other minor fixes.