cleaning up, adding target to links
adding analytics