Bugfixes to the latest revision
Some pages did not work due to missing imports, or wrongly
imported modules.
Patch by: Chen Lunpeng
Reviewd by: Sverre Rabbelier
Dictionaries need String values for keys
The cleanup patch earlier mistakenly used raw names as keys
to the dictionary (such as one would do in a function call).
This fixes that mistake.
Patch by: Sverre Rabbelier
Reviewed by: to-be-reviewed