adds a few links
fix merge - no conflicts. silly git.