Add in company numbers
kill off broken links for now
Merge branch 'master' into develop