Deleted noise.pde
Minor tweaks and cleanup
Fix merge conflict.