Last batch of edits from hackathon

Including removing synonyms that had URI values