Updated stuff to reflect different way of doing links and tags in editor