Multiple changes

- Eliminated hard coded links.
- Improved dictionary updates.