Adds normalize, updates cf-component-demo.

Weird that the diff is so crazy, sorry!