Fixes / some cleanup of noise demo.