various fixes:
deal with future workers, and non national workers.
fixes #4 and fixes #3
rename sql files to reflect that they belong to this plugin.