move hacks

hacks for non convergence around clouds are moved to better locations