Added turbulence and small tweaks and fixes