Better normalization. Continued working on refactoring specification.
Merge branch 'master' of git@github.com:ReinoutStevens/damp.qwalkeko.git