Fixed #52, updated 3rd party data & tidied javascript