Update to 2.1

Fixes bugs, makes the link tagging automatic, rather than using onclicks