adding a proper vocab url, misc context fixups.