Improved dictionary functions

Still hardcoded website.