Fixed several bugs in decorator, implemented generator that feeds urls. Not
entirely sure that it works properly. I'll wire it into the rest of the
program and have a look.
Merge pull request #3 from r3/master

Repairs and implementations