Fixed noise functions, need to fix generators