Adding link plugin and cleaning up a bit