Fixes and wire up onChange in demo.