wip
Fixups on noise demo.