Fix use of norm and collisions.
Merge branch 'master' of github.com:alvinlao/charm