added to dicts and fixed links