Some updates to the pyramid and detector (more or less my the commit I lost)
test
Again some very small changes to the Pyramid files, please have a look Peter

Wvm-Detector running, doesn't look that bad